specfile: exclude doc directories from package #1352
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request aims to fix lint failures caused by empty documentation directories in the RPM package. The approach involves explicitly listing only files (not directories) for packaging from the documentation directory, and ensuring a specific problematic directory contains a .keepdir file. The changes look good and effectively address the described issue.
Summary of Findings
- RPM Spec: Path formatting in
findcommand: Incontrib/packaging/bootc.specat line 126, thefindcommand uses-printf '/%{_docdir}/%%P\n'. Since%{_docdir}(e.g.,/usr/share/doc/bootc) already starts with a/, this results in paths inbootcdoclist.txtstarting with//(e.g.,//usr/share/doc/bootc/somefile.txt). While most systems normalize this, using-printf '%{_docdir}/%%P\n'would produce cleaner paths (e.g.,/usr/share/doc/bootc/somefile.txt). This is a low-severity stylistic improvement and a review comment was not added due to the project's review settings for comment severity.
Merge Readiness
The changes are well-implemented and address the problem described in the pull request. The code appears ready for merging. As a reviewer, I am not authorized to approve the pull request, so please ensure it undergoes any further required review and approval processes.
|
Before the change After the change |
champtar
force-pushed
the
spec-doc-no-dir
branch
2 times, most recently
from
f9851cd to
bc78a1c
Compare
When we don't install the documentation, rpm still install empty directories, leading to lint failures.
champtar
commented
Jun 11, 2025
cgwalters
approved these changes
Jun 11, 2025
|
For the record I think anyone affected by this with earlier bootc versions can work around this by just doing |
|
I confirm (that's what we do) |
Worth noting though for anyone using the The hack I went with is coreos/fedora-coreos-config#3589. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When we don't install the documentation, rpm-ostree (rpm works fine) still install empty directories, leading to lint failures.
Fixes #1351